From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 4 Sep 2011 19:06:14 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~846^2~2^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7ab3acf4ad7166a3ae8998a8a43ad59f852879ea;p=emacs.git

Merge from trunk.
---

7ab3acf4ad7166a3ae8998a8a43ad59f852879ea